Skip to content

[CONFLICT] [Backport stable-25-3-1] PR 29702: Badges to PR body #29713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 7 commits into
base: stable-25-3-1
Choose a base branch
from
Draft

[CONFLICT] [Backport stable-25-3-1] PR 29702: Badges to PR body #29713

wants to merge 7 commits into from

Conversation

@ydbot
Copy link
Collaborator

@ydbot ydbot commented Nov 27, 2025 •
edited
Loading

Changelog entry

Badges to PR body

Changelog category

  • Not for changelog (changelog entry is not required)

Description for reviewers

Original PR(s)

Metadata

Conflicts Require Manual Resolution

This PR contains merge conflicts that require manual resolution.

Files with conflicts:

How to resolve conflicts:

git fetch origin
git checkout --track origin/cherry-pick-stable-25-3-1-251127-233521
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

  1. Fix the PR title (remove [CONFLICT] if conflicts are resolved)
  2. Mark PR as ready for review

Git Cherry-Pick Log

=== Cherry-picking c8cecab ===
Auto-merging .github/actions/validate_pr_description/validate_pr_description.py
CONFLICT (content): Merge conflict in .github/actions/validate_pr_description/validate_pr_description.py
Auto-merging .github/workflows/run_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/run_tests.yml

error: could not apply c8cecab2b81... Add PR comment functionality for test runs
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

=== Cherry-picking 2134fc7 ===
Auto-merging .github/actions/validate_pr_description/validate_pr_description.py
[cherry-pick-stable-25-3-1-251127-233521 84b96764b63] Enhance PR comment functionality and add local validation script
 Author: naspirato <[email protected]>
 Date: Thu Nov 27 23:38:30 2025 +0100
 3 files changed, 257 insertions(+), 32 deletions(-)
 create mode 100644 .github/actions/validate_pr_description/test_validation.py

=== Cherry-picking d73acb7 ===
Auto-merging .github/workflows/run_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/run_tests.yml

error: could not apply d73acb789f4... Refactor PR comment script to streamline summary handling
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

=== Cherry-picking a0c2829 ===
Auto-merging .github/workflows/run_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/run_tests.yml

error: could not apply a0c2829e574... Enhance GitHub Actions workflow to post start comments on PRs
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

=== Cherry-picking 285b82d ===
Auto-merging .github/workflows/run_tests.yml
[cherry-pick-stable-25-3-1-251127-233521 899fb8bb921] Update GitHub Actions workflow to include sparse checkout for run_tests action
 Author: naspirato <[email protected]>
 Date: Thu Nov 27 23:54:28 2025 +0100
 1 file changed, 1 insertion(+)

=== Cherry-picking ccca540 ===
CONFLICT (modify/delete): .github/scripts/cherry_pick_v2.py deleted in HEAD and modified in ccca540c9a6 (Refactor cherry_pick_v2.py to use Any type for PullRequest references).  Version ccca540c9a6 (Refactor cherry_pick_v2.py to use Any type for PullRequest references) of .github/scripts/cherry_pick_v2.py left in tree.

error: could not apply ccca540c9a6... Refactor cherry_pick_v2.py to use Any type for PullRequest references
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

=== Cherry-picking 93cb08e ===
Auto-merging .github/actions/validate_pr_description/validate_pr_description.py
[cherry-pick-stable-25-3-1-251127-233521 91c4d497cbd] Refactor type hints in cherry_pick_v2.py for consistency
 Author: naspirato <[email protected]>
 Date: Fri Nov 28 00:17:02 2025 +0100
 2 files changed, 7 insertions(+), 9 deletions(-)

PR was created by cherry-pick workflow run

@naspirato @ydbot
BACKPORT-CONFLICT: manual resolution required for commit c8cecab
3a871b2
@naspirato @ydbot
Enhance PR comment functionality and add local validation script
84b9676 
This commit updates the PR comment script to include a workflow run URL in comments, improving traceability of test runs. It also modifies message formatting for better visibility. Additionally, a new script for local validation of PR descriptions is introduced, allowing users to test and validate PR bodies before submission. This script supports table generation for test execution and backport actions based on environment configurations.

Key changes:
- Updated `create_or_update_comment` function to accept and display workflow run URL.
- Improved message formatting in PR comments.
- Added `test_validation.py` for local PR description validation and table generation testing.
- Enhanced table generation logic in `validate_pr_description.py` to support side-by-side display of test and backport tables.
@naspirato @ydbot
BACKPORT-CONFLICT: manual resolution required for commit d73acb7
5942cef
@naspirato @ydbot
BACKPORT-CONFLICT: manual resolution required for commit a0c2829
48005d8
@naspirato @ydbot
Update GitHub Actions workflow to include sparse checkout for run_tes…
899fb8b 
…ts action

This commit enhances the GitHub Actions workflow by adding the `run_tests` action to the sparse checkout configuration. This change ensures that the necessary files for running tests are included in the checkout process, improving the workflow's efficiency and reliability.

Key changes:
- Added `.github/actions/run_tests/` to the sparse checkout list.
@naspirato @ydbot
BACKPORT-CONFLICT: manual resolution required for commit ccca540
2b99269
@naspirato @ydbot
Refactor type hints in cherry_pick_v2.py for consistency
91c4d49 
This commit updates the `cherry_pick_v2.py` script to ensure consistent use of type hints by removing unnecessary comments that specify the `PullRequest` type. This change enhances code clarity and maintains flexibility in handling various object types.

Key changes:
- Removed comments indicating specific types for `pull_requests` and related functions.
- Streamlined function signatures to improve readability and maintainability.
@ydbot ydbot mentioned this pull request Nov 27, 2025
Open
@github-actions
Copy link

github-actions bot commented Nov 27, 2025 •
edited
Loading

⚪ 2025-11-27 23:37:20 UTC Pre-commit check linux-x86_64-release-asan for 85e680a has started.
⚪ 2025-11-27 23:37:26 UTC Artifacts will be uploaded here
⚪ 2025-11-27 23:40:00 UTC ya make is running...
🟢 2025-11-27 23:40:06 UTC Tests successful.

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
0 0 0 0 0 0

🟢 2025-11-27 23:40:12 UTC Build successful.

@github-actions
Copy link

github-actions bot commented Nov 27, 2025 •
edited
Loading

🟢 2025-11-27 23:39:11 UTC The validation of the Pull Request description is successful.

@github-actions
Copy link

github-actions bot commented Nov 27, 2025 •
edited
Loading

⚪ 2025-11-27 23:45:47 UTC Pre-commit check linux-x86_64-relwithdebinfo for 85e680a has started.
⚪ 2025-11-27 23:45:54 UTC Artifacts will be uploaded here
⚪ 2025-11-27 23:48:26 UTC ya make is running...
🟢 2025-11-27 23:48:32 UTC Tests successful.

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
0 0 0 0 0 0

🟢 2025-11-27 23:48:37 UTC Build successful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@naspirato naspirato

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ydbot @naspirato